Fix incorrect fread return value check in ilasm strong-name key loading #121837
+1
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Summary This PR fixes a logic error in AsmMan::EndAssembly() that incorrectly treated a successful fread() call as a failure. The incorrect condition: ``` dwBytesRead = fread(m_sStrongName.m_pbPublicKey, 1, m_sStrongName.m_cbPublicKey, fp)) <= m_sStrongName.m_cbPublicKey) ``` causes the error branch to execute even when the full key file has been read successfully (dwBytesRead == m_sStrongName.m_cbPublicKey). This results in ilasm failing to read .snk key files when building TestILAssembly on big Endian Systems. Environment: Architecture: s390x OS: Ubuntu Runtime : Mono cc: @uweigand @giritrivedi @saitama951
dotnet-policy-service
bot
added
the
community-contribution
github-actions
bot
added
the
needs-area-label
Member
|
Introduced in #116203. Do we have strong name coverage in the repo at all? |
huoyaoyuan
added
area-ILTools-coreclr
and removed
needs-area-label
Contributor
|
Tagging subscribers to this area: @JulieLeeMSFT |
Author
|
There is only very limited strong-name coverage in the repo, and none for the ilasm key-file reading that #116203 modified. |
Author
|
@Dotnet-s390x build |
|
Build Queued.. To cancel the current build, please comment: |
|
Build Successful |
Author
|
@JulieLeeMSFT @huoyaoyuan The s390x CI is failing because of this, can this be merged? |
Member
|
There are multiple ilasm failures in last CI build, and the build has expired. Can you merge and rerun them to see if they are related? /cc @jkotas |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
This PR fixes a logic error in AsmMan::EndAssembly() that incorrectly treated a successful fread() call as a failure. The incorrect condition:
causes the error branch to execute even when the full key file has been read successfully (dwBytesRead == m_sStrongName.m_cbPublicKey).
This results in ilasm failing to read .snk key files when building TestILAssembly on Big Endian Systems.
Environment:
Architecture: s390x
OS: Ubuntu
Runtime : Mono
cc: @uweigand @giritrivedi @saitama951